Merge "Fix bug with trying to split an app with itself" into tm-qpr-dev