PIM-3364 : fix channel manager and completeness scheduling