Merged in changes from v1.55