Merge with latest ionic