Quick release code
Fix merge conflicts