Merge "fix vertical spacing following collection" into klp-modular-dev