Simplify => Incorporate fca9a9bdd002672dd43db9c1f345f793693b521d from Remy branch