Updated KZPropertyMapper
Merge pull request #3264 from cirkos/master

Updated KZPropertyMapper