[DF-5597] Added inline modification
[DF-5597] Fixed initialization order