Merge commit 'nodemanager-1.8-28' into 1.8