[KFSQA-783] Ready to push to master, pending merger of missing commits.