Merge branch '12-shader-executor-constants' into '12-shader-executor'