Merge pull request #2923 from tano-systems/pr/multi-fix