added from ericsson's patch (it was probably forgotten when merging)
added from ericsson's patch
(it was probably forgotten when merging)

MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame