solution for Issue 389
Merge remote-tracking branch 'upstream/develop'