Merge FXP
montblanc-common: initial push