merged app changes into the gem
for pull request renewal