Added Pinlocations and delete
Merged with upstream master
Done merging