@rough-minister-58256 I don't have the time to dedicate to another review cycle, so definitely feel free to merge #316 and then get the additional changes you wanted from #399 on top of it before the release