Merge "Set updatable:false explicity." into sc-dev