Merge remote-tracking branch 'origin/issue/303' into devel