Merged recent changes from v1.55