Initial commit for #8733