Fixed Merge-Issue #6