Squashed 'src/Front/' changes from f8ed173..d61d32e

d61d32e Merge commit '3d36fc8129000f74586a0a09c3a4b1c3a71ef8f5'
3d36fc8 Squashed 'View/' changes from bb9e63c..7febcc6

git-subtree-dir: src/Front
git-subtree-split: d61d32e2f6d969edf5570b01cdfdc113bbaecdfa
Merge commit '2c45355ce3541167b967c4e02168d0d91f409da9'