Merge pull request #5902 from akshay83/develop

[fix] serial no button