Update org chart - migrate to new config API completely
Merge remote-tracking branch 'origin/master'