Add missing HFS checks
Merge branch 'Toastman-RT' into Toastman-RT-N