BS-9934
Add section validation