Import changes made on 17.04 with ForzarGuardar