Merge branch 'feature/JAL-4315_fc_draganddrop' into develop