Branch 1.5 reached EOL
Merge branch '1.5' into 1.6
Branch 1.6 is in maintenance mode