merged from cjmanca