Adding upstream version 1.154.7.