Task #205: Fixed incorrect merge into live branch