Merged v1.55 to refactor-db