Merge branch dev
Apply previous commit to install page too