Merge "Replaced 'touch' by 'tap'." into nyc-dev