Created by: acrovato
This PR consists in bringing the latest development into master. They consist of the following: