Issue in merge v1.3.1 - Twenty