Merge Fixes for Issue #72