Merge "Cleaner implementation; use resource" into jb-ub-mail