closes #0 closes [CE-0] ### Changes: