Merge branch 'empty-values'