Merge from v1.55 to development plus some other changes