Merge "Revert the hint session support part" into main