[SD-1067] Merging and cleanup
[SD-1067] Merging and cleanup
[SD-1067] Date facets and cleanup