Fix compile error due to missing string-trim function and default to on
increment version
mv-shell not defined twice