Merge development with master

This will cause the EC pattern to be official by merging the development branch into the master branch.