Lps 42107

cc @sammso, please double check to make sure it is working correctly.