Update v0.0.121.3 with new upstream backport