Pg 3.7

part of dragons1.27->master