Codec fixes, working on passing unit tests
FB spotlight fix
Merging
Restored container