commit #552