am 1da00bd8: Merge "Clarify assumptions and simplify" into jb-ub-mail-ur8

* commit '1da00bd839ce1245f5671cebb4b00ad25e6feb60':
  Clarify assumptions and simplify