Merge pull request #1251 from vchong/ld_img_v2

poplar: misc updates