Added some missing helper methods.
Merge remote-tracking branch 'origin/devel' into devel