Merge  #1628 and build again

Rebase wip/no-blankies to current branch
Would you mind adding some Scaladoc comments on what the intended input/output for this is?