Fixes for issues [DF-545], [DF-548], [DF-549] and [DF-550] are merged to feature-new-material branch.