am b07850b4: Follow-up for 1.0.1j upgrade

* commit 'b07850b4cc8e8ee333cb877168c371aacf20a7b2':
  Follow-up for 1.0.1j upgrade