Merge "Fixed Autofill workflow is broken"