Merge of develop-nr into develop
This tag has no release notes.