Merged changes from Flux