Merge "Add the "enable emsg" flag" into rvc-dev