Sync up with commit 006b11fd0ad8a0df6d22de095ca703f6eb80ad55 of the base