Improve Query/Update property mapping. #3697
Description
The current KeyMapper implementation should be improved by making use of Persistent | PropertyPath to avoid keeping track of individual key fragments while mapping the target key.
relates to: #3688