Fix some inconsistent push/pops

Micael Oliveirarequested to merge
fix_push_pop into develop

Description

Fix some inconsistent push/pops.

News snippet

Fix some inconsistent push/pops

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.

Merge request reports