bug fix and cleanup
release date change
Merge branch '28-applydefine' into 29