extended hinting work (PR #4788) - including header and rename