Fix merge between 0.12.x and 0.13.x branches