Added patch to refactor code to match the recent coding standards using depen...