Feature/zen12092

Half of the fix to ZEN-12092. The other half is in serviced.