Merge "Ngrx store changes"