#gh-34 Fixed Critical
#gh-3~54 Fixed Exception Critical
#gh-35 Fixed Exception Critical
Merge branch 'feature-yyy' into release-xxx