Merge branch 'bug-fixing-branch' into zmc
Merge branch 'zmc' into bug-fixing-branch