Merged v1.5