DDBEXTRA-192: post review fix