Merge "Remove deprecated generateAndStoreKey method implementation" into pi-dev