Merge branch 'master' into 4.0-ex_expired-non-quantum