Merge remote-tracking branch 'allan/optimisation'

1 job for master in 15 seconds (queued for 1 second)