(cherry picked from commit b714f552392310cd23b8e71402dfa64b629d2190) The two new changes were really missing on master.