[master/f19-branch] Initial Setup related patches