Merge latest Choco and small file changes