Remove the typehint on the merge method to support the CMS
Merge branch 'master' into 2.0-dev
Revert "Remove the typehint on the merge method to support the CMS"

This reverts commit b9b8058fafad9cdb046d26821bb29112a709fa0a.