manual merge of master branch changes up to commit 1387bc6