align to mosaic backport and rebase