Merge branch 'develop' into feature/JAL-244_Automatically_adjust_left_margin_to_avoid...