port cd23a6a to vic.5 develop branch, fixes #178