am 42930641: Merge "Fix issues 5158104 and 4981556 (fragment problems)"

* commit '42930641792ecd23fee6b2913ba1e7cf24634f3d':
  Fix issues 5158104 and 4981556 (fragment problems)