Merged fixes from v1.55