#344
Merge remote-tracking branch 'upstream/development' into V8.5
Resolved GitHub Issues

Resolved #342, #343