Changes from step-2
Ignore some more
(cherry picked from commit b86b20a)