[WIP] Patch check list #725
+40
−0
Merged
8000