[Luis, Evgeny] change data refactoring and fixing
[Luis, Evgeny] merge master