Merge branch 'dev' into cli
Prints in parser erased
Merge branch 'cli' into dev