Merge commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d' * commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d': SIP: misc fixes