Merge branch 'groovy_dev' into syncmm
fixed stack dependencies
merge