Add working on bug:730 and update page for bug:654 completed