Break down work for #2975
Break down work for #2975