40-06

Master is up to date with 40-06