Merge branch 'bug/JAL-1751_make-table-uneditable' into develop