1.2.x branch is now frozen
Fixed: merge issue