Changes from fc-branch