Feature Merge: bugfixing