bugFix #C3174
Merge remote-tracking branch 'origin/test' into dev