Fixed incorrect merge task-149 into live branch