Add ability to change fill color
(cherry picked from commit 54f25da224038585ea8f876a884393c1601adae0)