LPS-34860 jspc and minor changes