Merge commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99' * commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99': SIP: minor fixes.
Merge commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99' * commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99': SIP: minor fixes.