Merge "Fix issue with slippery flag not being updated correctly" into pi-dev