Added additional DLS build files to configure directories
Merge remote branch 'upstream/master'