Fixed to commarch
Fixed to commarch

Former-commit-id: c37c870bf2152b4c0fb80e178c20247d10fc409d [formerly 7fd1edf0a8260e5da91cb8784ed92de8a010b8fa] [formerly bdf133fae0b1ee96e04b9c2559d96da6a496930c]
Former-commit-id: f127d9ca40765bea5465360e58ee263984e7e639 [formerly d2105fd0a7ad9e0a01888d6fecfc68d92a48ec35]
Former-commit-id: 17619a2ec2e3d484b7405cb3ce2189bda2596f2d
ritjoe/ofCourse,sctjkc01/ofCourse,sctjkc01/ofCourse,ritjoe/ofCourse,ryansb/ofCourse,ryansb/ofCourse