Merge "Remove subscriptionModelLoader flag"