Merged Flux Dev + VKP 8500 + VKP 7500 - v1