Move commit 2afceddc3172b79b75ee94 to master branch