This PR is a rebase of #898 for CI to pass Thanks @efussi for your collaboration. Closes #892 Reviewed-by: Yuriy Novostavskiy Reviewed-by: Bianca Henderson <beeankha@gmail.com>