support for nonimg elts refactored
Merge branch 'develop'