code-policed
RELEASE-NOTES: synced with 0614b902136