[Tutti-commits] branch feature/6847 created (now 6d394e7)