Improve assertion message
Merge branch 'release/v1.1.9'