STAND-65: I changed system prop at appropriate place