commit #816