Nearly all working with v1.55 changes merged into v1.60