Re-adding missing files from the last merge attempt (+2 squashed commit)

Squashed commit:

[30c5e29] Re-adding missing files from the last merge attempt

[53bcfea] Re-adding missing files from the last merge attempt