Add post 3.6.3 commits from upstream as patches to fix important issues (build tested locally); required for 12.3