Merged in 828d2