Sneha/D3 | #1124 | Feedback on white labeling