Merge "Add more tests for mtectrl override" into main