Merge pull request #3640 from ussuri/small-fixes-3

Fix: paper-fab fill color was incorrectly set in cde-fab
Merge remote-tracking branch 'upstream/master' into small-fixes-3