Feature/merge upstream version 2.7.1