[SD-1003] Role cannot inherit itself as its ancestor
Merge remote-tracking branch 'andrew/devel' into devel