Merge "Only store Application context"