Merge branch 'confrefactor' into 'master'

Confrefactor

Do not merge, just comparing Honza's refactoring

See merge request !1