Don't use readonly variable.
Merge branches 'master' and 'develop'