Merge branch 'feature/contract/sato/1.0.300_52153_disconnected_alert' into feature/contract/sato/1.0.300_52170_unlock
