Merge branch 'patch/JAL-4114_updated_3dbeacons_api' into develop