changes from temporarily on-hold scm-reader