Dev 5.0

merge upstream/dev_5.0 into feature/image