Updates from commit 7a3149dc223