fixed drawing order
Merge remote-tracking branch 'origin/develop-JK' into develop-SN
Merge remote-tracking branch 'origin/master' into develop-SN
fixed transform.before() usages