Widgets / Keyword selection / Support 2 concepts with same label (#293).
Merge remote-tracking branch 'origin/develop' into develop