Brought over 10.18 changes from old branch