Merge pull request #2880 from tano-systems/pr/fix-for-2878