Merged v1.55 back to dev to start 1.6 series