Merged until 2.3.6 release