#88707: Fixes to badly solved conflict.
Merge pull request #251 from luisromangz/88707-FixesToConflicts

#88707: Fixes to badly solved conflict.