CYKLO-941: resource retrieval optimization
release 2.24.4