Zibi's comment
EJ's comments
Updated settings unit tests
Updated sms handler tests
One small fix to Privacy Panel Item