SONARPMD-35 additional updates