Feature/merge upstream version 2.6.2