Merge recent additions from unstable branch