Add note on #9742 and new tests