Merge "Deprecate LoginFilter"