Merge "Levarge latest XtestingCI changes"