AttributesMapper refactoring
Added the attribute mappers mechanism
filtering dictionaries by extension
Merge remote-tracking branch 'mpawlak/RELEASE-3.1-LOT' into RELEASE-3.1-LOT
fixes