Code

Merge "checkout ambiguous ref bugfix" into maint