Merge "Bug 3651: Fix creation of External EPG."