Squashed changes from derek
(cherry picked from commit 38c1f8c79acebb9ed61265f6188ac23fb3032a08)