0005474: oxfield2shop is not cleaned any more (cherry picked from commit bec57b2) (cherry picked from commit 04532d9)