dev commit

10-06
Merge pull request #1 from osaamadasun/7.1.4

dev commit