Fixing bug where output properties weren't properly collected.
Merge branch 'release-2.1'