Yesterday
merge from blueprint_fragment_fix