Merged minor fixes from v1.55