Adjustment to features missing from merge

Change-Id: I201c5790c25613610f533e6a563f61d153e317cc
Signed-off-by: Thomas Kee <xsited@yahoo.com>