Catch up merge from flerda into 2.1