Merge branch 'fsd_aug30' into fsd_new