Done with the chain of responsibility
Merge origin/master