VRP: painter improvements part 2
(cherry picked from commit c91c61b8df544d61d4f9f164ff1b771d4527db3a)