Implemented the suggestions from c5bf3178c3d610198341d24f7c52175fdd570ebb

[#80392902]