Task #255: Resolved incorrect merge 255 branch into master