Merge "Removing warnings related to optionals"