Merge commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc' * commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc': Dont persist config on failure
Merge commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc' * commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc': Dont persist config on failure