Merge "Accommodate NaN in new context menu methods." into nyc-dev