Reverted commits a0a846dbb4413bc88af8dd5763f581ed59ef746e to eff52b321bbaddf2c54223af837e93241aca3d7c as they were accitentally commited to this branch. See branch develop.