POD-3706 work in progress