Merge "Follow-up for  Ife38c2cd94ac9902911b005dbbca8b0d0a62e6d7"