For merge

PoC. Manually tested. Probably need localize all messages.