Sync Frameworks base with BeanStalk part 1

Change-Id: If5292401eb287b25b5a591e5f65f920cf4df40b3