STAND-65: Added System Property Changes at appropriate place