LOOM-1803-REBASED: Rebased to master and ready to rock