assets management improvements

(cherry picked from commit 14e0e76a3025a0a7925f79e6078d91cc5e4c28c5)