Merge branch 'task/JAL-3042_remove_SimpleDocument_dependency' into develop