Reset organograms module from prod2 code.
Add not empty to supress notice.
Merge branch 'organogram'