Synch with the flim-1_14 branch.