Merged v1.6564-refactor