Merging feature/156 by @raamdev manually. Referencing websharks/s2member#156