Merge "StateQueue comments"