Updated branch 1.4