Following up on PR review
Following up on PR review

simong/Hilary,stuartf/Hilary,Coenego/Hilary,ExC0d3/Hilary,jfederico/Hilary,mrvisser/Hilary,timdegroote/Hilary,simong/Hilary,Orodan/Hilary,mrvisser/Hilary,nicolaasmatthijs/Hilary,nicolaasmatthijs/Hilary,stuartf/Hilary,ExC0d3/Hilary,timdegroote/Hilary,Orodan/Hilary,jfederico/Hilary