Merged in last few changes to v1.55