Merge branch 'v3_core-comprehensions-cleanup' into eep19
WIP