Fix NPE due to wrong key used for lookup
updated
Merge remote-tracking branch 'upstream/master'