case 2048 - Minor fixes for correct module work.
Merge branch 'case-2048' into develop