dist with subdir content
Merge commit 'd1627bb22cf96e0260d2f64ae0990a82f0715789'