patrick branch merge into master branch