1 19 14 rollup

Rollup complete, compatible with server rollup