Merged in couple additional changes from v1.55