[REF] #112 - Add deprecated modules
Merge commit 'refs/pull/113'