AS-6440 Fix embedded container modules and bundles path handling