Merge branch 'feature/idea-project' into stable-3.0.x