Merge latest changes from feature/automation