Merge branch 'task/JAL-3337-rm-lib-update-sourceDist' into develop