Fix #3604
Merge branch '3064' of /home/git/repositories/harmony/tact-mda