Merge "SIM toolkit enhancements and bug fixes"