Will be addressed as part of UP-3844