Code review approved: high quality bug fix, backward compatible design, comprehensive tests (10 cases).