Merge "Add CreatePropertyBuffer() back to test utils" into devel/master