Merge branch 'bug/JAL-2277_refactorPrintUnwrapped' into develop