QUICKFIX merge 3/14