Merge changes from feature/automation