merge master to BBB

should be ok, except matrix size to change after merge