merging new features

3 jobs for devel in 9 seconds (queued for 2 seconds)