merged sbopkg 0.37.0