Merge branch 'JAL-368_dragabovedesktop' into Release_2_7_Branch