Merge "DO NOT MERGE Fix conditional when checking for confirm key." into nyc-dev