manually apply pull req 1908 and 1903