RF-12801: enabled resource optimisation