Squashed 'public/' content from commit 097e67e

git-subtree-dir: public
git-subtree-split: 097e67e51183aad719675c49d0ffa92b04107323
Merge commit 'e5ea3994abed5c47460f1459a3872455a75a34a0' as 'public'
fixed config