Work on #242, #243, #244, #245 and #246

=====================================================
You are strongly advised to prepare a local backup before pulling this
commit
=====================================================
Work on #242, #243, #244, #245 and #246

=====================================================
You are strongly advised to prepare a local backup before pulling this
commit
=====================================================