Merge from flerda