Merge in 6 back into dev with install