Reverting change, code change does not work
Merge remote-tracking branch 'origin/devel' into devel