Task #255: Fixed incorrect merge into master branch