Merge "Force set to entered state to avoid overflow" into main