The patch for 1080171 was already pushed to the master, so it this relevant anymore?