Merge "Use renamed template 'integrated-gate-py3'"