MERGE FROM _tk v1.1.2