FMA shadow fix
Merge branch 'Mar-6-1437'