Release 2.6 update#432

rakeshSgr merged 2 commits intostagingELEVATE-Project/user:stagingfrom

release_2.6_updateELEVATE-Project/user:release_2.6_updateCopy head branch name to clipboard