#915 - PR follow-up