Merge latest changes in dev-modular