Revert "Revert "Merge branch 'devel'""

This reverts commit ac9a1999196c2857259ebe0a50f9d8387678d2a4.