Features/feature merge behavior clean

Merge behvarior patch with tests.