Merge "Require $key in msg() functions"