Pull request to merge release branch

The codebase is stable and is ready for release therefore it is merged with master branch