Merge "Remove account param from generateKey method"