Bug 894230

Use strong consistency properly and when creating an app