Minor edits to enable switching CTL source to 'hotfixes' branch of main repo.