Merge "Fix docker image generation when not profile is selected"