GGEP-4: implement changes of graphics project issue GGP-15