Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com> (cherry picked from commit 96d913b147f13fb7f7226a65d24c7da6dedf469a)