Merge  #1628 and build again

Rebase wip/no-blankies to current branch