Merge "Reminder to freeze keymaster at version "5""