Updates based on PR discussion #3135.