Integration

Merge integration branch into master for hotfix