am eb90b985: Merge "Follow-up for 1.0.1j upgrade"

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