Fixed offline compression issue
Merge branch 'feature/push-state' into staging