Finish integration with logic
Merge branch 'master' into Other
Integrating with UI
Merge branch 'Other'