Updated with Habla SVN repository Nonweak changes