Merge branch 'V5-5-patches' into V5-6-patches