VSTS - 12856

Test on alignment of components