Add customizable nullable message
Merge branch 'add-nullable-message'