Merge branch 'feature/example-cahn-hilliard' into 'master'