Follow change in [e17549c80425f3/base]