Merge branch 'module/calc' into dev
add sender param to cmd event
Merge command changes