Merge branch 'issue/45a' into develop