Stable inclusion for commit 36904703aeee