Merge branch 'Emma-Fix' into Fin-Fin-text