Imported Upstream version 6.3.3
Merge tag 'upstream/6.3.3'

Upstream version 6.3.3
update changelog fixing patches to apply.