Merge branch 'master' into dev
version bump to 4.12.4
Merge branch 'dev'