Merge remote-tracking branch 'origin/integration'
Disable default constructor