Merge "Fixed User class IDE warnings"