Changes from roqua compared to develop.