Merge "Add optional flag to clear old preloaded workspace" into klp-dev