Merged fixes from v1.54 to development