review for cmdmod fix
Merge branch 'f3' into develop