am 7b2d12e6: Merge "Follow-up for 1.0.1j upgrade, part 2"

* commit '7b2d12e610bdfd93aa05fc3475726d0f3e25215c':
  Follow-up for 1.0.1j upgrade, part 2