40.2.5 - master