Merge "Retain stacks even if they are empty." into klp-modular-dev