PRD-3857 and PRD-4486 and golden sample fixes for PRD-4216