Merge changes Ib8fe719f,Ia8c05780 into sc-dev

* changes:
  Suppress IpServer message logs
  Remove *Locked wording