Revert "Merge branch 'devel_c' into Devel"

This reverts commit d0d794fe1e7cddb29efd0303213d62709a4e4e9e.