Pull in all changes to blend symmetryPlane and redmesa branches