release 2.5.4, enhancement for issue #63