Fixing minor code analysis violations before release 1.15.0