The right-click changes in this CL aren't related to the latching behavior -- could you remove them?