Merged scdl_fixes branch to master.