Finish v1.5.4.1

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>