Merge branch '1216' into zmc1216