Fix deprecations; Use 'double' instead of 'stub'
Merge branch 'fix-deprecations'

* fix-deprecations:
  Fix deprecations; Use 'double' instead of 'stub'