Merge pull request #765 from chandrasekharv/dev-branch

Performance Task, ideas and Questions boxes removed when the content is empty
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch