assets management improvements

(cherry picked from commit 00b0aef689e5ed1ac08f0f58bc90c5562c45b3e9)