reverted improved flat graphic context (partly reverted from commit e484de98516ab9be9f6589cb3c5843781b2281a2)
Merge branch 'legacy'