Added a backport of version 1.0.0