Merge 1.5.x with master commit a3e629027db6eb6ebb1dc2ebcd5c7606fe109075