Added a unit test for embedded resources with conditions
Merge remote-tracking branch 'upstream/master'