NH-3702

https://nhibernate.jira.com/browse/NH-3702
Added with unit tests