introduced ResourceKeyBuilder (not in use yet)
Merge remote-tracking branch 'origin/master'