Merge "Improve current program info validation." into pi-dev