Merge branch 'develop' into task/JAL-3337_gradle_tasks_sourceDist_and_help2Website