Merged comments on off toggle issue from 6.6.3.a1 branch