commit #527