Merge pull request #1262 from mpg/merge-2.28

[2.28] merge public into 2.28-restricted