Merge pull request #13350 from alalek:fix_kw_gapi