Fix incorrect merge result.
Description
Fix incorrect merge result due to a conflict in !559 (merged) and !557 (merged).
Checklist
-
I have checked that my code follows the Octopus coding standards -
I have added tests for all the new features added in this request.
Edited by Micael Oliveira