file encryption app backport master -> stable5

This branch contains the backport of the encryption app which was already approved and merged into master. Just waiting for the green light from Jenkins before we merge the backport into stable5.