Merge changes from SBV version 3.3

Includes changes after LeventErkok/sbv@67656c6abad7a25b2626fa52d1a16003dff5294d (Nov 3)
and up to LeventErkok/sbv@6468f41bde18242296accb1c38a23dc402061a5f (Dec 5)