Jason Thompson pushed to project branch 3541437-add-a-slot at Issue forks / mercury-3541437

Jason Thompson (f0b86464) at 18 Aug 13:46

Fix conflict.

... and 2 more commits