Merge "Update Paint_Delegate following commit 7fd36d1"