Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into releases/Release_2_11_2_Branch