Merge "Add tap targets to top 2 sections" into rvc-dev