CLC-3731 CLC-3668 CLC-3510 Fix duplicated secondary sections
Merge pull request #2503 from raydavis/raywip

CLC-3731 CLC-3668 CLC-3510 Fix duplicated secondary sections