Merge "Remove no longer necessary MS_LAZYTIME definitions." into main