Merge "Add more info on control key param"