Fix compatibility after cherry pick + make Items prototype extendable