Added same changes in master branch, because merge won't work (?).