[DF-5005] reload resorces
[DF-5005] review fix
[DF-5005] fix review comment
Merge branch 'DF-5005_reload_resources' into development