Merge fixes transferred to dataset

- transferred fixes for application branch to this dataset