Merge branch 'patch/JAL-3976_3dbeaconsnull' into develop