v5.4.2.1
(cherry picked from commit bafeca198a18ed7165bb333785231bd3ededf0ce) (cherry picked from commit f2424bb22fa5f52abe08e9dbff7cda33a443c6d3)
(cherry picked from commit bafeca198a18ed7165bb333785231bd3ededf0ce) (cherry picked from commit f2424bb22fa5f52abe08e9dbff7cda33a443c6d3)