Fixes #8437 - Combine docker commands under docker parent