Merged v2.053