Merge from develop fixes. Refs 9ce3ae6d54d81c315f5614e08f5f7821e63a13e6