null reconstruction fix
Bumped version to 2.1.5-beta
Merge branch 'release/2.1.5-beta'