CLC-3031 Fix "Declaration of Major" block message
Merge pull request #2690 from raydavis/raywip

CLC-3031 Fix "Declaration of Major" block message