1044 - Merge from bixly-testing