Feature/update from upstream