Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'

mmit message to explain why this merge is necessary,
fixed filtering issue with subteam parents query
missed something