Merge pull request #112 from asbalaji/R1.06

On behalf of Sagar.
BugID 1329190. …
* Duplicate of encapsulation in priority is blocked.
* Adding the second encapsulation is fixed.