Merge "Chore: Updates to improve overall robustness of robot framework tooling"