Merge dev with last changes of homeinstall script in master
Created by: einervonvielen
Merge the last changes made in master for homeinstall script also into dev.
Created by: einervonvielen
Merge the last changes made in master for homeinstall script also into dev.