Merge "Use true instead of 1 in while" into integration