Merge "Add checks to detect wrong conditions when creating Applications"