Merge brlcad commits for step though 54859