Merge commit '79748b42e3e891c0d1541753c133fa83638146ce' * commit '79748b42e3e891c0d1541753c133fa83638146ce': Fix duplicate entries being added when application is in active use
Merge commit '79748b42e3e891c0d1541753c133fa83638146ce' * commit '79748b42e3e891c0d1541753c133fa83638146ce': Fix duplicate entries being added when application is in active use