Merge "fix smack related code"