Continue #2502
Merge pull request #2505 from samoht/master

Continue #2502