Merge: Devel into Master

Devel changes are working in production and considered stable. Have fun!