[1.3.3] Tag, setDefaults merge #2288, #2686