bugfix
readonly field bugfix
Merge branch 'master' into sub_resources