New engine build with updated dynamic markerk API.
Propagating changes from blankslate branch.