[#2103] Merged svn refs 5529 and 5531 in core.re