Implemented non-exclusive label inheritance
Merge cleanup