Framework base sync with BeanStalk part 3- Many thanks to ScottHartBti.

Change-Id: I58c62e89c01fd28efc9be3257b5092de6364f560