merged fixes for latest liquid