Merge pull request #3794 from nabinhait/serial_no

[fix] serial no validation in return entry