Lot of Commits. Hope it will be ok

Fingers crossing
commitd
Commit, again
FSMember updated
d
Commit again
Resolution