Squash 1 commit

(due to registry group download failure)

Old commits on registry-fail branch