pull some additions from static-channellognormal into static-stable