Drool Rule Fix
Merge commit 'f0f3d3cf353f2ebbfb34f66204001aebda720958'