Merge "Expanding getDataSystemDeDirectory to be more consistent." into main