Revert "merging development into master"

This reverts commit ef37b054a03a8059398bcf59fe1fd69646eee007.