Revert "Revert "Ver 1.5.4""

This reverts commit 49886c076460fb049bab13e7ab7b8d10dbe16023.