Merge "Remove a method" into jb-ub-mail-ur9