[artf712185] : Commit for, Changes that are lost due to 2.3 plug-in merge