REcent container bug fixes by Avtiveon

Merged maciek riedl requested to merge morphemic-rc2.5 into morphemic-rc3.0

(cherry picked from commit e323256d)

Merge request reports