cm merge bugfix
beta 2m