Merge branch 'improvement/JAL-4245-return-null-from-getRootDataset' into development...