40.1.17 - master