Merge "Follow-up to Ie3499d"