DF-4535 fixed component saving