Hotfix 1 and project version backmerge

### Changelog:
* Backmerge #734 and eea812a9029649e5149f7679b072aeffbade808e into `develop`.