1.15.3

See parent project for all changes

1.10.3 Backport

Fixed small merge issues

1.7.2

Used existing class instance creation function

1.7.1 Backport

v1.7.1.1

Activity Class refrence fixes