[branches] backfire: backport cmake integration updates from trunk