Release/6.9.4 See merge request !81
Hotfix/detail comment See merge request !80
Release/6.9.4 See merge request !78