Add option to disable zero filling. Closes #612. Closes #934