Merge branch 'develop' into features/r2_11_2/JAL-3829_3dbeacons