Merge branch '5.3.x' into 6.0.x

Author: puneetbehl

.github/release-drafter.yml

@@ -20,7 +20,6 @@ categories:
       - "type: ci"
       - "type: build"
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
-filter-by-commitish: true
 version-resolver:
   major:
     labels: