Merge "removed extra argument from extractByKey method"