Resolve "revise TOP handling of BDY segments for v 4.2.1"

Merged Tomas Lovato requested to merge 100-revise-top-handling-of-bdy-segments-2 into branch_4.2

This apply the same set of changes of MR !163 (merged) to the branch 4.2

Closes #100 (closed)

Merge request reports