Code commits

Smack (4.4)