backport V70 asset mgt changes