Fixed incorrect patches for merged applications.
Merge branch 'issue/1871' into develop