Merge branch 'to_merge/r2_11_2/JAL-3904_improved_alignpanelAPI_autoshowview' into...