Merge commit '92798a481cbd928711339606bc1d9e81fa80f7b2' * commit '92798a481cbd928711339606bc1d9e81fa80f7b2': SIM toolkit enhancements and bug fixes
Merge commit '92798a481cbd928711339606bc1d9e81fa80f7b2' * commit '92798a481cbd928711339606bc1d9e81fa80f7b2': SIM toolkit enhancements and bug fixes