Merge branch '3.0.x' into feature/No-Jira-Remove-redudant-declaration-of-Java-target-and-source-version