Staging to Master

Move features opt in communication and improved transaction to master.