Applying forgotten changes from master branch