Merge "Skip-tests template fix"