Fixed assembly version
Merge commit 'de870845632c22d634c1cfe449fdf97a78576e18'