suggestions from Leon

1 job for !95 with add-hpbx-y095 in 43 seconds (queued for 1 second)
latest merge request