pull-request-1678