Backport 0.85 update from trunk