Core: 2D optimizations
thnks to xperiafan13

Change-Id: Id68984725fa7f4b180a84994be96172ccd8c9a9f