70 Commits (hotfix/merge)