Merged v1.54 to development