Merge branch 'installer-patch-1'