[TIDOC-1962] Some enhancements