fixed registry sorting
Merge remote-tracking branch 'jira/design' into design
Merge remote-tracking branch 'coyotte/design' into design