Initial pss-ereg commit-ashwin