Only rendering section if it exists
Merge branch 'Aaron' into Develop