Do some checking to make sure what we did is correct
Merge branch 'develop' into release/12.0
check for empties