Merge branch 'fix_install_fe_bug' into 'develop'