Prepared for upcoming 1.5.x versions.