#master: 2.6.7