Merge branch 'features/JAL-2039_Offer_cached_structurefiles_immediately' into develop