Merge "annoint new constants" into mnc-dev