replace setXObjects with lists containing null elements to fix tests in
unstable branch
Merge branch 'dev' into unstable-2.0