imported most recent version from maniple/maniple-core@680b6fe6bf