Merge remote-tracking branch 'fork/2664676-store-warning-tests' into 2664676-store-warning-tests