Merge pull request #4591 from amet/subs_fixes