Merge branch 'fc/parseopt-config' into next