Bring act-refactor up-to-date with master