Merge branch 'release/1.6.1'
bump non module version