PE-1528 and PE-1529 - See updates on
https://parelastic.jira.com/wiki/x/BAD7Ag