Before 2.2.5 release
