merge from flim-1_14 branch: