Fixes
Merge remote-tracking branch 'upstream/ose' into HEAD