Various review changes, pre-branching for List features