synapse/stweaks changes pushed to stable branch