STAND-65: Finally placed System Properties changes at appropriate place