Merge branch 'features/JAL-1933_occupancy' into develop