Merge "Use the same key for put and get" into jb-ub-mail-ur10