Merge branch 'develop' into task/JAL-2196pdbeProperties