reconcile with mean source version 0.2.3 as merged with master