Fix for shifting rendering markers.
Merging origin/jbuchanan/master-pending-rendering-markers into master