Record empty selections
Merge branch 'develop'