manual merge of dddd957c, explicitly list SDK image dependencies

Merge commit 'dddd957c'