Closely syncing v1.55 with v1.60