Fixed a validation issue within forking code.
Merge remote-tracking branch 'origin/devel' into devel