Ajay/Melanie | #3134 | Bugfix - Disable default select option