EDOC-1041
migrate to 3.7