reworking the patch for the branch master.