Enable separate constituent init
Fix merge error