Merge remote-tracking branch 'origin/stable' into new-features