Merge hotfix-add-stuff (#2) into stable

as

f f ff
asdfasdf
as
df
asf
as
df
Merge hotfix--ada-asfd (#3) into master

asdfasdf

as
df
asf
as
df