Merge "Check settings validators for NPE" into pi-dev