Merge pull request #6485 from MrPetovan/bug/fixes-after-2019-03-develop-rebase