Follow changes in [7ab62490/base] (re #7633)