Merge branch 'bugs/JAL-2777_whitespaceChain' into develop