Support for MS Smart taildocker - 34