IAP GITLAB
This is a reimplementation of !604 (closed) which got stuck in a rebase loop. For more discussion and details, see that MR