Fx integration ii merge into master