BACKLOG-3863 : handle mixins