merging chunk-11 features into git