Merge pull request #5666 from nabinhait/fixed_asset_revisited

Fixed asset revisited