update to be pushed only to 1.2 (1.x branch)