2nd modf

[#1587434]
Merge pull request #1 from phampdx/feature/1587434-test2

2nd modf
Merge pull request #2 from phampdx/master

Master