Lock for think-dock as well
Merge branch 'singleton-guard' into env+singleton-guard