Back-port 4121 patch