Merge commit 'smcv/ready/optimize-depends'