Board Thread:Internal management/@comment-26239911-20170617163015/@comment-7091122-20170617211818

Split it back for now, THEN vote on merging.