swc-1036 - dream changes