PR-8672-BUILD-840