Merge pull request #682 from bakaid/MINIFICPP-1086

Signed-off-by: Daniel Bakai <bakaid@apache.org>

Approved by aboda on GH