Merge branch 'fec-align'