Updated manifest
Merge branch 'feature_dots'