Merge "Guard old way of cloning app for S+ versions" into sc-dev