[bugfix] sug replace bug FEBASE-736
Merge remote-tracking branch 'origin/dev' into dev