master: 3b5ad9ea3f831059380084987eaa08e2bd1ea18c Simplify