[CLC-3133] Textbooks: Consolidate messages
Merge remote-tracking branch 'ets/master' into CLC-3133
Merge pull request #2042 from haroonrasheed333/CLC-3133

[CLC-3133] Textbooks: Consolidate messages