Missing changes in 313b294d6b7b248738e30f8164ee4624a66ac5b5