Conforming to ustrade up to 8.6.4