Merge branch 'QOS-Classnames' into Toastman-RT