Revert "devel branch"

This reverts commit d88e5efc00aa3e41be0eb77f83746456f6302c12.
Merge remote-tracking branch 'origin/master' into devel-1