Merge branch 'nikitakit_transform'