PLA 1806 & 1807 and 1808

@idradm