[DF-1205] merging action component from development