COMMIT_13_6_6 small updates and catching up
COMMIT_6_11_13