Merge branch 'jc/po-pritime-fix'