Fix for DEV
Merge branch 'foundation_new' of https://github.com/tetianahogg/Alpha7 into foundation_new