Merge pull request #14109 from rohitwaghchaure/asset_adjustment_fixes

[Fix] Asset adjustment issues