Merge remote-tracking branch 'sailthru/v3.0-vip' into v3.0-vip

Updating branch with bug fixes from remote parent