Merge branch 'release/3.0' into develop
remove this hack and ignore subjects properly
bump version
Merge branch 'release/3.1'