Add iframe parent scrolling and merge changes from master