Remove xit on specs to run all.
Merge branch 'develop-fftf'