Merge "Optimize get/set reflection performance"