finished
Merge branch 'bug_976_last_v_ROR' into dev