Apr

Sync up from JQE APR branch.