Closes BC#45619660