Merge branch 'V5-4-patches' into V5-7-patches