Merge "Follow-up for 1.0.1j upgrade, part 2"