[DF-555] issue is fixed.
[DF-555] issue is fixed - more changes.
[DF-555] issue is fixed - more changes, merged to feature-new-development branch.