Merge Fixes for Issue #19