Organization features [KFSQA-581]
Merge remote-tracking branch 'remotes/origin/KFSQA-581'