Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'