v2.5.7 - Resolved #555