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