Make same changes as in master branch