Mastery Weapon Progresses Merged (?)

ok, since I didn't receive any answer in the general topic, I'll ask here:

have Mastery Weapon Progresses been Merged? including weapon challenges progresses?

moreover, Why did I receive about 40 BP levels when I received Cross Progression? which is the reason?

thank you.