d161479237
Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71' * commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71': SIP: misc fixes.