[DF-4801] fix warnings.
[DF-4801] fix color inherit
[DF-185] merged with development