Added messages from IMC branch 'feature/activationlock'