This was fixed - soft vs hard tabs, but still seeing the comment. Everything else fixed, ready for re-CR and merge.