Fixed scenario 1 of issue #569.
Scenario 2 works as expected.
Merge pull request #590 from blackberry/next-569

Next 569