Fixed Customization merge. Added FX part.