Merge "Add benchmark for property mapping"