Merge branch 'dev' again

Merge branch 'dev' again  revert G'