Merge commit 'af3e233fe3222990440433d5f90a6a310d0170e3' * commit 'af3e233fe3222990440433d5f90a6a310d0170e3': fix [2262591] Junk on screen in ERD46
Merge commit 'af3e233fe3222990440433d5f90a6a310d0170e3' * commit 'af3e233fe3222990440433d5f90a6a310d0170e3': fix [2262591] Junk on screen in ERD46