DO-5313 and DO-5065 issues has been fixed.