Backporting 0104f32d (default-registry :tag) to stable branch