Merge "Add Keymaster V4.0"