I have followed the discussion on this - what is a bit odd is that the old mode did kind of presume you're in semi-manual in loiter. Which let's me kind of wonder if we can fix this for good? At any rate, not a reason to not merge this pull request.