MARMOTTA-431: last details