Merge "Finalise STK call control strings" into pi-dev