EmbedXcode+ upgrade

Changes related to EmbedXcode upgrade