Merge commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8' * commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8': Fixes #1928566. Prevents runtime restart upon configuration change.
Merge commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8' * commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8': Fixes #1928566. Prevents runtime restart upon configuration change.