fixes
Squashed 'src/Front/' changes from 1e2b032..2ac6e91

2ac6e91 fixes

git-subtree-dir: src/Front
git-subtree-split: 2ac6e91f7f741690414bf2d1eb77ef94e7ce702d
Merge commit '73649c2230f0301a9955bc1e29e0373c858cefb9'