Thanks Keryn Knight for the report and vanessagomes for the pckport of [d44aa981] from master.atch. Backport of [d44aa981] from master.