Add note about changing key.
Add more to note.
Merge branch '4.2'