Merge pull request #4239 from FernetMenta/active