Made constant.
Some minor change.
Merge remote-tracking branch 'origin/develop' into develop