pull-request-869-bis