DEV-17630
DEV-13497
DEV-13497
Merge pull request #14 from Unact/master

DEV-17630, DEV-13497