Dev-freeze --> Master staging [DO NOT MERGE]

Approaching point we will be ready to merge. Last few bug fixes left to do.