OPAL-1737, OPAL-1740, OPAL-1741, OPAL-1743

Fixed