Really ugly trick to fix a cluster support issue. Will be changed
Merge commit 'a4cf9f5'