Fix for PE-1540.
Fix for PE-1554.
Fix for PE-1554.