XD-1368 - Eliminated shared module context