Fixing #513
Weak patch for #635
Merge remote-tracking branch 'upstream/stable-develop' into stable-develop
Merge remote-tracking branch 'origin/stable-develop' into stable-develop