Backport of the version 1.9.5 into the Gotham tree