Merge "Revert "Now KeepMarker is a singleton"" into ub-jack