Fixing deprecated module import
Merge commit '2d34aaef885bf36b2890b1c8767a690c0ba0500d'

* commit '2d34aaef885bf36b2890b1c8767a690c0ba0500d':
  Fixing deprecated module import