Merged v1
into v1.3.0-aplha
with hotfixes
#966
Merged
v1
into v1.3.0-aplha
with hotfixes
#966