Merge remote-tracking branch 'oblomov/liquid_fixes'