Sneha/D3 | #1124 | white labeling