[z1901] Fix Liquid Extraction and better hole support

(based on commit [s1482] - e4389c8)