Merge commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed' into kraken * commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed': More framework tests cleanup.
Merge commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed' into kraken * commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed': More framework tests cleanup.