Merge branch '2695_expansion_to_src'