Platform update from 8-stable.
3 files changed