SW-74. Incorporate changes to SConstruct from develop branch.