*added support for DO-5163